@@ -1,5 +1,4 @@  | 
            ||
| 1 | 1 | 
                * ``Refresh Cache`` => ``Delete Cache``  | 
            
| 2 | 2 | 
                * Remove GROUP_USERS_XXX_SET ?  | 
            
| 3 | 3 | 
                * ``get_group_info`` vs. ``group.data``  | 
            
| 4 | 
                -* Docstring simplify  | 
            |
| 5 | 4 | 
                * ``admin_id`` vs. ``user_id`  | 
            
                @@ -15,11 +15,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 15 | 15 | 
                 | 
            
| 16 | 16 | 
                @logit  | 
            
| 17 | 17 | 
                def tourguide_submit_api(request):  | 
            
| 18 | 
                - """  | 
            |
| 19 | 
                - 导游信息提交  | 
            |
| 20 | 
                - :param request:  | 
            |
| 21 | 
                - :return:  | 
            |
| 22 | 
                - """  | 
            |
| 18 | 
                + """ 导游信息提交 """  | 
            |
| 23 | 19 | 
                     unionid = request.POST.get('unionid', '')
               | 
            
| 24 | 20 | 
                     openid = request.POST.get('openid', '')
               | 
            
| 25 | 21 | 
                     phone = request.POST.get('phone', '')
               | 
            
                @@ -37,11 +37,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 37 | 37 | 
                 | 
            
| 38 | 38 | 
                @logit  | 
            
| 39 | 39 | 
                def lensman_submit_api(request):  | 
            
| 40 | 
                - """  | 
            |
| 41 | 
                - 摄影师信息提交  | 
            |
| 42 | 
                - :param request:  | 
            |
| 43 | 
                - :return:  | 
            |
| 44 | 
                - """  | 
            |
| 40 | 
                + """ 摄影师信息提交 """  | 
            |
| 45 | 41 | 
                     unionid = request.POST.get('unionid', '')
               | 
            
| 46 | 42 | 
                     openid = request.POST.get('openid', '')
               | 
            
| 47 | 43 | 
                     phone = request.POST.get('phone', '')
               | 
            
                @@ -71,11 +67,7 @@ def lensman_submit_api(request):  | 
            ||
| 71 | 67 | 
                 | 
            
| 72 | 68 | 
                @logit  | 
            
| 73 | 69 | 
                def lensman_login_api(request):  | 
            
| 74 | 
                - """  | 
            |
| 75 | 
                - 摄影师登录  | 
            |
| 76 | 
                - :param request:  | 
            |
| 77 | 
                - :return:  | 
            |
| 78 | 
                - """  | 
            |
| 70 | 
                + """ 摄影师登录 """  | 
            |
| 79 | 71 | 
                     username = request.POST.get('username', '')
               | 
            
| 80 | 72 | 
                     password = request.POST.get('password', '')
               | 
            
| 81 | 73 | 
                 | 
            
                @@ -152,11 +144,7 @@ def lensman_price_fix_api(request):  | 
            ||
| 152 | 144 | 
                 | 
            
| 153 | 145 | 
                @logit  | 
            
| 154 | 146 | 
                def lensman_photo_upload_api(request):  | 
            
| 155 | 
                - """  | 
            |
| 156 | 
                - 摄影师照片上传  | 
            |
| 157 | 
                - :param request:  | 
            |
| 158 | 
                - :return:  | 
            |
| 159 | 
                - """  | 
            |
| 147 | 
                + """ 摄影师照片上传 """  | 
            |
| 160 | 148 | 
                     user_id = lensman_id = request.POST.get('user_id', '')
               | 
            
| 161 | 149 | 
                     nickname = request.POST.get('nickname', '')
               | 
            
| 162 | 150 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
                @@ -28,11 +28,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 28 | 28 | 
                 | 
            
| 29 | 29 | 
                @logit  | 
            
| 30 | 30 | 
                def tg_group_create_api(request):  | 
            
| 31 | 
                - """  | 
            |
| 32 | 
                - 旅行团创建  | 
            |
| 33 | 
                - :param request:  | 
            |
| 34 | 
                - :return:  | 
            |
| 35 | 
                - """  | 
            |
| 31 | 
                + """ 旅行团创建 """  | 
            |
| 36 | 32 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 37 | 33 | 
                     group_name = request.POST.get('group_name', '')
               | 
            
| 38 | 34 | 
                     group_default_avatar = int(request.POST.get('group_default_avatar', 0))
               | 
            
                @@ -108,11 +104,7 @@ def tg_group_create_api(request):  | 
            ||
| 108 | 104 | 
                 | 
            
| 109 | 105 | 
                @logit  | 
            
| 110 | 106 | 
                def tg_group_detail_api(request):  | 
            
| 111 | 
                - """  | 
            |
| 112 | 
                - 旅行团详情  | 
            |
| 113 | 
                - :param request:  | 
            |
| 114 | 
                - :return:  | 
            |
| 115 | 
                - """  | 
            |
| 107 | 
                + """ 旅行团详情 """  | 
            |
| 116 | 108 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 117 | 109 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 118 | 110 | 
                 | 
            
                @@ -125,11 +117,7 @@ def tg_group_detail_api(request):  | 
            ||
| 125 | 117 | 
                 | 
            
| 126 | 118 | 
                @logit  | 
            
| 127 | 119 | 
                def pai2_tginfo_api(request):  | 
            
| 128 | 
                - """  | 
            |
| 129 | 
                - 首页旅行团信息  | 
            |
| 130 | 
                - :param request:  | 
            |
| 131 | 
                - :return:  | 
            |
| 132 | 
                - """  | 
            |
| 120 | 
                + """ 首页旅行团信息 """  | 
            |
| 133 | 121 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 134 | 122 | 
                 | 
            
| 135 | 123 | 
                # 获取用户当前所处旅行团  | 
            
                @@ -146,11 +134,7 @@ def pai2_tginfo_api(request):  | 
            ||
| 146 | 134 | 
                 | 
            
| 147 | 135 | 
                @logit  | 
            
| 148 | 136 | 
                def tg_group_update_api(request):  | 
            
| 149 | 
                - """  | 
            |
| 150 | 
                - 旅行团更新  | 
            |
| 151 | 
                - :param request:  | 
            |
| 152 | 
                - :return:  | 
            |
| 153 | 
                - """  | 
            |
| 137 | 
                + """ 旅行团更新 """  | 
            |
| 154 | 138 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 155 | 139 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 156 | 140 | 
                     group_name = request.POST.get('group_name', '')
               | 
            
                @@ -207,11 +191,7 @@ def tg_group_update_api(request):  | 
            ||
| 207 | 191 | 
                 | 
            
| 208 | 192 | 
                @logit  | 
            
| 209 | 193 | 
                def tg_group_close_api(request):  | 
            
| 210 | 
                - """  | 
            |
| 211 | 
                - 旅行团关闭  | 
            |
| 212 | 
                - :param request:  | 
            |
| 213 | 
                - :return:  | 
            |
| 214 | 
                - """  | 
            |
| 194 | 
                + """ 旅行团关闭 """  | 
            |
| 215 | 195 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 216 | 196 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 217 | 197 | 
                 | 
            
                @@ -238,11 +218,7 @@ def tg_group_close_api(request):  | 
            ||
| 238 | 218 | 
                 | 
            
| 239 | 219 | 
                @logit  | 
            
| 240 | 220 | 
                def tg_group_gather_start_api(request):  | 
            
| 241 | 
                - """  | 
            |
| 242 | 
                - 旅行团设置集合时间和地点  | 
            |
| 243 | 
                - :param request:  | 
            |
| 244 | 
                - :return:  | 
            |
| 245 | 
                - """  | 
            |
| 221 | 
                + """ 旅行团设置集合时间和地点 """  | 
            |
| 246 | 222 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 247 | 223 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 248 | 224 | 
                     gather_at = tc.utc_string_to_utc_datetime(request.POST.get('gather_at', ''))  # UTC, %Y-%m-%dT%H:%M:%SZ
               | 
            
                @@ -280,11 +256,7 @@ def tg_group_gather_start_api(request):  | 
            ||
| 280 | 256 | 
                 | 
            
| 281 | 257 | 
                @logit  | 
            
| 282 | 258 | 
                def tg_group_token_api(request):  | 
            
| 283 | 
                - """  | 
            |
| 284 | 
                - 旅行团权限管理票据  | 
            |
| 285 | 
                - :param request:  | 
            |
| 286 | 
                - :return:  | 
            |
| 287 | 
                - """  | 
            |
| 259 | 
                + """ 旅行团权限管理票据 """  | 
            |
| 288 | 260 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 289 | 261 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 290 | 262 | 
                 | 
            
                @@ -295,11 +267,7 @@ def tg_group_token_api(request):  | 
            ||
| 295 | 267 | 
                 | 
            
| 296 | 268 | 
                @logit  | 
            
| 297 | 269 | 
                def tg_group_transfer_api(request):  | 
            
| 298 | 
                - """  | 
            |
| 299 | 
                - 旅行团权限管理转移  | 
            |
| 300 | 
                - :param request:  | 
            |
| 301 | 
                - :return:  | 
            |
| 302 | 
                - """  | 
            |
| 270 | 
                + """ 旅行团权限管理转移 """  | 
            |
| 303 | 271 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 304 | 272 | 
                     admin_id = request.POST.get('admin_id', '')  # 导游唯一标识,识别二维码获取
               | 
            
| 305 | 273 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -25,11 +25,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 25 | 25 | 
                 | 
            
| 26 | 26 | 
                @logit  | 
            
| 27 | 27 | 
                def tgu_group_user_join_api(request):  | 
            
| 28 | 
                - """  | 
            |
| 29 | 
                - 旅行团用户加群  | 
            |
| 30 | 
                - :param request:  | 
            |
| 31 | 
                - :return:  | 
            |
| 32 | 
                - """  | 
            |
| 28 | 
                + """ 旅行团用户加群 """  | 
            |
| 33 | 29 | 
                     admin_id = request.POST.get('admin_id', '')  # 导游唯一标识,识别二维码获取
               | 
            
| 34 | 30 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 35 | 31 | 
                     nickname = request.POST.get('nickname', '')
               | 
            
                @@ -109,11 +105,7 @@ def tgu_group_user_join_api(request):  | 
            ||
| 109 | 105 | 
                 | 
            
| 110 | 106 | 
                @logit  | 
            
| 111 | 107 | 
                def tgu_group_user_update_api(request):  | 
            
| 112 | 
                - """  | 
            |
| 113 | 
                - 旅行团用户更新  | 
            |
| 114 | 
                - :param request:  | 
            |
| 115 | 
                - :return:  | 
            |
| 116 | 
                - """  | 
            |
| 108 | 
                + """ 旅行团用户更新 """  | 
            |
| 117 | 109 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 118 | 110 | 
                     admin_id = request.POST.get('admin_id', '')  # 导游唯一标识
               | 
            
| 119 | 111 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -162,11 +154,7 @@ def tgu_group_user_update_api(request):  | 
            ||
| 162 | 154 | 
                 | 
            
| 163 | 155 | 
                @logit  | 
            
| 164 | 156 | 
                def tgu_group_user_locations_api(request):  | 
            
| 165 | 
                - """  | 
            |
| 166 | 
                - 旅行团所有用户位置信息  | 
            |
| 167 | 
                - :param request:  | 
            |
| 168 | 
                - :return:  | 
            |
| 169 | 
                - """  | 
            |
| 157 | 
                + """ 旅行团所有用户位置信息 """  | 
            |
| 170 | 158 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 171 | 159 | 
                     admin_id = request.POST.get('admin_id', '')  # 导游唯一标识
               | 
            
| 172 | 160 | 
                 | 
            
                @@ -186,11 +174,7 @@ def tgu_group_user_locations_api(request):  | 
            ||
| 186 | 174 | 
                 | 
            
| 187 | 175 | 
                @logit  | 
            
| 188 | 176 | 
                def tgu_group_user_location_api(request):  | 
            
| 189 | 
                - """  | 
            |
| 190 | 
                - 旅行团单个用户位置信息  | 
            |
| 191 | 
                - :param request:  | 
            |
| 192 | 
                - :return:  | 
            |
| 193 | 
                - """  | 
            |
| 177 | 
                + """ 旅行团单个用户位置信息 """  | 
            |
| 194 | 178 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 195 | 179 | 
                     admin_id = request.POST.get('admin_id', '')  # 导游唯一标识
               | 
            
| 196 | 180 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -46,11 +46,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 46 | 46 | 
                @logit  | 
            
| 47 | 47 | 
                @transaction.atomic  | 
            
| 48 | 48 | 
                def group_create_api(request):  | 
            
| 49 | 
                - """  | 
            |
| 50 | 
                - 群组创建  | 
            |
| 51 | 
                - :param request:  | 
            |
| 52 | 
                - :return:  | 
            |
| 53 | 
                - """  | 
            |
| 49 | 
                + """ 群组创建 """  | 
            |
| 54 | 50 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 55 | 51 | 
                     group_name = request.POST.get('group_name', '')
               | 
            
| 56 | 52 | 
                     group_default_avatar = int(request.POST.get('group_default_avatar', 0))
               | 
            
                @@ -102,11 +98,7 @@ def group_create_api(request):  | 
            ||
| 102 | 98 | 
                 | 
            
| 103 | 99 | 
                @logit  | 
            
| 104 | 100 | 
                def group_detail_api(request):  | 
            
| 105 | 
                - """  | 
            |
| 106 | 
                - 群组详情  | 
            |
| 107 | 
                - :param request:  | 
            |
| 108 | 
                - :return:  | 
            |
| 109 | 
                - """  | 
            |
| 101 | 
                + """ 群组详情 """  | 
            |
| 110 | 102 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 111 | 103 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 112 | 104 | 
                 | 
            
                @@ -119,11 +111,7 @@ def group_detail_api(request):  | 
            ||
| 119 | 111 | 
                 | 
            
| 120 | 112 | 
                @logit  | 
            
| 121 | 113 | 
                def group_update_api(request):  | 
            
| 122 | 
                - """  | 
            |
| 123 | 
                - 群组更新  | 
            |
| 124 | 
                - :param request:  | 
            |
| 125 | 
                - :return:  | 
            |
| 126 | 
                - """  | 
            |
| 114 | 
                + """ 群组更新 """  | 
            |
| 127 | 115 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 128 | 116 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 129 | 117 | 
                     group_name = request.POST.get('group_name', '')
               | 
            
                @@ -169,11 +157,7 @@ def group_update_api(request):  | 
            ||
| 169 | 157 | 
                 | 
            
| 170 | 158 | 
                @logit  | 
            
| 171 | 159 | 
                def group_list_api(request):  | 
            
| 172 | 
                - """  | 
            |
| 173 | 
                - 群组列表  | 
            |
| 174 | 
                - :param request:  | 
            |
| 175 | 
                - :return:  | 
            |
| 176 | 
                - """  | 
            |
| 160 | 
                + """ 群组列表 """  | 
            |
| 177 | 161 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 178 | 162 | 
                     page = int(request.POST.get('page', 1))
               | 
            
| 179 | 163 | 
                     num = int(request.POST.get('num', settings.GROUP_PER_PAGE))
               | 
            
                @@ -194,11 +178,7 @@ def group_list_api(request):  | 
            ||
| 194 | 178 | 
                 | 
            
| 195 | 179 | 
                @logit  | 
            
| 196 | 180 | 
                def group_join_api(request):  | 
            
| 197 | 
                - """  | 
            |
| 198 | 
                - 申请加群  | 
            |
| 199 | 
                - :param request:  | 
            |
| 200 | 
                - :return:  | 
            |
| 201 | 
                - """  | 
            |
| 181 | 
                + """ 申请加群 """  | 
            |
| 202 | 182 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 203 | 183 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 204 | 184 | 
                     nickname = request.POST.get('nickname', '')
               | 
            
                @@ -256,11 +236,7 @@ def group_join_api(request):  | 
            ||
| 256 | 236 | 
                 | 
            
| 257 | 237 | 
                @logit  | 
            
| 258 | 238 | 
                def group_lock_api(request):  | 
            
| 259 | 
                - """  | 
            |
| 260 | 
                - 群组锁定  | 
            |
| 261 | 
                - :param request:  | 
            |
| 262 | 
                - :return:  | 
            |
| 263 | 
                - """  | 
            |
| 239 | 
                + """ 群组锁定 """  | 
            |
| 264 | 240 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 265 | 241 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 266 | 242 | 
                 | 
            
                @@ -286,11 +262,7 @@ def group_lock_api(request):  | 
            ||
| 286 | 262 | 
                 | 
            
| 287 | 263 | 
                @logit  | 
            
| 288 | 264 | 
                def group_unlock_api(request):  | 
            
| 289 | 
                - """  | 
            |
| 290 | 
                - 群组解锁  | 
            |
| 291 | 
                - :param request:  | 
            |
| 292 | 
                - :return:  | 
            |
| 293 | 
                - """  | 
            |
| 265 | 
                + """ 群组解锁 """  | 
            |
| 294 | 266 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 295 | 267 | 
                     admin_id = request.POST.get('admin_id', '') or request.POST.get('user_id', '')
               | 
            
| 296 | 268 | 
                 | 
            
                @@ -316,11 +288,7 @@ def group_unlock_api(request):  | 
            ||
| 316 | 288 | 
                 | 
            
| 317 | 289 | 
                @logit  | 
            
| 318 | 290 | 
                def group_remove_api(request):  | 
            
| 319 | 
                - """  | 
            |
| 320 | 
                - 成员移除  | 
            |
| 321 | 
                - :param request:  | 
            |
| 322 | 
                - :return:  | 
            |
| 323 | 
                - """  | 
            |
| 291 | 
                + """ 成员移除 """  | 
            |
| 324 | 292 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 325 | 293 | 
                     admin_id = request.POST.get('admin_id', '')
               | 
            
| 326 | 294 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -361,11 +329,7 @@ def group_remove_api(request):  | 
            ||
| 361 | 329 | 
                 | 
            
| 362 | 330 | 
                @logit  | 
            
| 363 | 331 | 
                def group_quit_api(request):  | 
            
| 364 | 
                - """  | 
            |
| 365 | 
                - 成员退出  | 
            |
| 366 | 
                - :param request:  | 
            |
| 367 | 
                - :return:  | 
            |
| 368 | 
                - """  | 
            |
| 332 | 
                + """ 成员退出 """  | 
            |
| 369 | 333 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 370 | 334 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 371 | 335 | 
                 | 
            
                @@ -405,11 +369,7 @@ def group_quit_api(request):  | 
            ||
| 405 | 369 | 
                 | 
            
| 406 | 370 | 
                @logit  | 
            
| 407 | 371 | 
                def group_pass_api(request):  | 
            
| 408 | 
                - """  | 
            |
| 409 | 
                - 申请通过  | 
            |
| 410 | 
                - :param request:  | 
            |
| 411 | 
                - :return:  | 
            |
| 412 | 
                - """  | 
            |
| 372 | 
                + """ 申请通过 """  | 
            |
| 413 | 373 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 414 | 374 | 
                     admin_id = request.POST.get('admin_id', '')
               | 
            
| 415 | 375 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -450,11 +410,7 @@ def group_pass_api(request):  | 
            ||
| 450 | 410 | 
                 | 
            
| 451 | 411 | 
                @logit  | 
            
| 452 | 412 | 
                def group_refuse_api(request):  | 
            
| 453 | 
                - """  | 
            |
| 454 | 
                - 申请拒绝  | 
            |
| 455 | 
                - :param request:  | 
            |
| 456 | 
                - :return:  | 
            |
| 457 | 
                - """  | 
            |
| 413 | 
                + """ 申请拒绝 """  | 
            |
| 458 | 414 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 459 | 415 | 
                     admin_id = request.POST.get('admin_id', '')
               | 
            
| 460 | 416 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -495,11 +451,7 @@ def group_refuse_api(request):  | 
            ||
| 495 | 451 | 
                 | 
            
| 496 | 452 | 
                @logit  | 
            
| 497 | 453 | 
                def group_data_api(request):  | 
            
| 498 | 
                - """  | 
            |
| 499 | 
                - 群组数据, 评论数, 点赞数  | 
            |
| 500 | 
                - :param request:  | 
            |
| 501 | 
                - :return:  | 
            |
| 502 | 
                - """  | 
            |
| 454 | 
                + """ 群组数据, 评论数, 点赞数 """  | 
            |
| 503 | 455 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 504 | 456 | 
                 | 
            
| 505 | 457 | 
                     return response(200, 'Get Group Data Success', u'获取群组数据成功', {
               | 
            
                @@ -509,11 +461,7 @@ def group_data_api(request):  | 
            ||
| 509 | 461 | 
                 | 
            
| 510 | 462 | 
                @logit  | 
            
| 511 | 463 | 
                def flyimg_upload_api(request):  | 
            
| 512 | 
                - """  | 
            |
| 513 | 
                - 飞图上传/飞图列表  | 
            |
| 514 | 
                - :param request:  | 
            |
| 515 | 
                - :return:  | 
            |
| 516 | 
                - """  | 
            |
| 464 | 
                + """ 飞图上传/飞图列表 """  | 
            |
| 517 | 465 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 518 | 466 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 519 | 467 | 
                     nickname = request.POST.get('nickname', '')
               | 
            
                @@ -586,11 +534,7 @@ def flyimg_upload_api(request):  | 
            ||
| 586 | 534 | 
                 | 
            
| 587 | 535 | 
                @logit  | 
            
| 588 | 536 | 
                def comment_submit_api(request):  | 
            
| 589 | 
                - """  | 
            |
| 590 | 
                - 飞图评论提交/飞图评论列表  | 
            |
| 591 | 
                - :param request:  | 
            |
| 592 | 
                - :return:  | 
            |
| 593 | 
                - """  | 
            |
| 537 | 
                + """ 飞图评论提交/飞图评论列表 """  | 
            |
| 594 | 538 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 595 | 539 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 596 | 540 | 
                     to_uid = request.POST.get('to_uid', '')
               | 
            
                @@ -673,11 +617,7 @@ def comment_submit_api(request):  | 
            ||
| 673 | 617 | 
                 | 
            
| 674 | 618 | 
                @logit  | 
            
| 675 | 619 | 
                def thumbup_submit_api(request):  | 
            
| 676 | 
                - """  | 
            |
| 677 | 
                - 飞图点赞提交  | 
            |
| 678 | 
                - :param request:  | 
            |
| 679 | 
                - :return:  | 
            |
| 680 | 
                - """  | 
            |
| 620 | 
                + """ 飞图点赞提交 """  | 
            |
| 681 | 621 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 682 | 622 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 683 | 623 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
                @@ -765,11 +705,7 @@ def thumbup_submit_api(request):  | 
            ||
| 765 | 705 | 
                 | 
            
| 766 | 706 | 
                @logit  | 
            
| 767 | 707 | 
                def thumbup_list_api(request):  | 
            
| 768 | 
                - """  | 
            |
| 769 | 
                - 飞图点赞列表  | 
            |
| 770 | 
                - :param request:  | 
            |
| 771 | 
                - :return:  | 
            |
| 772 | 
                - """  | 
            |
| 708 | 
                + """ 飞图点赞列表 """  | 
            |
| 773 | 709 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 774 | 710 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 775 | 711 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
                @@ -782,11 +718,7 @@ def thumbup_list_api(request):  | 
            ||
| 782 | 718 | 
                 | 
            
| 783 | 719 | 
                @logit  | 
            
| 784 | 720 | 
                def thumbup_cancel_api(request):  | 
            
| 785 | 
                - """  | 
            |
| 786 | 
                - 飞图点赞取消  | 
            |
| 787 | 
                - :param request:  | 
            |
| 788 | 
                - :return:  | 
            |
| 789 | 
                - """  | 
            |
| 721 | 
                + """ 飞图点赞取消 """  | 
            |
| 790 | 722 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 791 | 723 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 792 | 724 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
                @@ -856,11 +788,7 @@ def thumbup_cancel_api(request):  | 
            ||
| 856 | 788 | 
                 | 
            
| 857 | 789 | 
                @logit  | 
            
| 858 | 790 | 
                def pai2_home_api(request):  | 
            
| 859 | 
                - """  | 
            |
| 860 | 
                - 首页照片信息  | 
            |
| 861 | 
                - :param request:  | 
            |
| 862 | 
                - :return:  | 
            |
| 863 | 
                - """  | 
            |
| 791 | 
                + """ 首页照片信息 """  | 
            |
| 864 | 792 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 865 | 793 | 
                     page = int(request.POST.get('page', 1))
               | 
            
| 866 | 794 | 
                     num = int(request.POST.get('num', settings.PAI2_HOME_PER_PAGE))
               | 
            
                @@ -933,11 +861,7 @@ def pai2_home_api(request):  | 
            ||
| 933 | 861 | 
                 | 
            
| 934 | 862 | 
                @logit  | 
            
| 935 | 863 | 
                def lensman_photo_price(request):  | 
            
| 936 | 
                - """  | 
            |
| 937 | 
                - 摄影师照片价格获取  | 
            |
| 938 | 
                - :param request:  | 
            |
| 939 | 
                - :return:  | 
            |
| 940 | 
                - """  | 
            |
| 864 | 
                + """ 摄影师照片价格获取 """  | 
            |
| 941 | 865 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 942 | 866 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
| 943 | 867 | 
                     photo_type = request.POST.get('photo_type', 'nomark')  # nomark for 去除水印, origin for 获取高清图
               | 
            
                @@ -974,11 +898,7 @@ def lensman_photo_price(request):  | 
            ||
| 974 | 898 | 
                 | 
            
| 975 | 899 | 
                @logit  | 
            
| 976 | 900 | 
                def lensman_photo_bought(request):  | 
            
| 977 | 
                - """  | 
            |
| 978 | 
                - 摄影师照片已购买  | 
            |
| 979 | 
                - :param request:  | 
            |
| 980 | 
                - :return:  | 
            |
| 981 | 
                - """  | 
            |
| 901 | 
                + """ 摄影师照片已购买 """  | 
            |
| 982 | 902 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 983 | 903 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
| 984 | 904 | 
                 | 
            
                @@ -14,11 +14,7 @@ from utils.redis.rmessage import set_system_message_delete_info, set_system_mess  | 
            ||
| 14 | 14 | 
                 | 
            
| 15 | 15 | 
                @logit  | 
            
| 16 | 16 | 
                def message_list_api(request):  | 
            
| 17 | 
                - """  | 
            |
| 18 | 
                - 消息列表  | 
            |
| 19 | 
                - :param request:  | 
            |
| 20 | 
                - :return:  | 
            |
| 21 | 
                - """  | 
            |
| 17 | 
                + """ 消息列表 """  | 
            |
| 22 | 18 | 
                     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
               | 
            
| 23 | 19 | 
                 | 
            
| 24 | 20 | 
                messages = UserMessageInfo.MESSAGE_TYPE_INFO  | 
            
                @@ -45,12 +41,7 @@ def message_list_api(request):  | 
            ||
| 45 | 41 | 
                 | 
            
| 46 | 42 | 
                @logit  | 
            
| 47 | 43 | 
                def message_type_list_api(request, msg_type):  | 
            
| 48 | 
                - """  | 
            |
| 49 | 
                - 分类消息列表  | 
            |
| 50 | 
                - :param request:  | 
            |
| 51 | 
                - :param msg_type:  | 
            |
| 52 | 
                - :return:  | 
            |
| 53 | 
                - """  | 
            |
| 44 | 
                + """ 分类消息列表 """  | 
            |
| 54 | 45 | 
                     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
               | 
            
| 55 | 46 | 
                     page = int(request.POST.get('page', 0) or request.GET.get('page', 0) or 1)
               | 
            
| 56 | 47 | 
                     num = int(request.POST.get('num', 0) or request.GET.get('num', 0) or settings.MESSAGE_NUM_PER_PAGE)
               | 
            
                @@ -77,11 +68,7 @@ def message_type_list_api(request, msg_type):  | 
            ||
| 77 | 68 | 
                 | 
            
| 78 | 69 | 
                @logit  | 
            
| 79 | 70 | 
                def message_type_read_api(request, msg_type=None):  | 
            
| 80 | 
                - """  | 
            |
| 81 | 
                - 消息读取  | 
            |
| 82 | 
                - :param request:  | 
            |
| 83 | 
                - :return:  | 
            |
| 84 | 
                - """  | 
            |
| 71 | 
                + """ 消息读取 """  | 
            |
| 85 | 72 | 
                     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
               | 
            
| 86 | 73 | 
                     pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)
               | 
            
| 87 | 74 | 
                     _all = (request.POST.get('all', '') or request.GET.get('all', '')).lower()
               | 
            
                @@ -113,12 +100,7 @@ def message_type_read_api(request, msg_type=None):  | 
            ||
| 113 | 100 | 
                 | 
            
| 114 | 101 | 
                @logit  | 
            
| 115 | 102 | 
                def message_type_delete_api(request, msg_type=None):  | 
            
| 116 | 
                - """  | 
            |
| 117 | 
                - 消息删除  | 
            |
| 118 | 
                - :param request:  | 
            |
| 119 | 
                - :param msg_type:  | 
            |
| 120 | 
                - :return:  | 
            |
| 121 | 
                - """  | 
            |
| 103 | 
                + """ 消息删除 """  | 
            |
| 122 | 104 | 
                     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
               | 
            
| 123 | 105 | 
                     pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)
               | 
            
| 124 | 106 | 
                     _all = (request.POST.get('all', '') or request.GET.get('all', '')).lower()
               | 
            
                @@ -14,11 +14,7 @@ from utils.redis.rsettings import get_app_settings_info  | 
            ||
| 14 | 14 | 
                 | 
            
| 15 | 15 | 
                @logit  | 
            
| 16 | 16 | 
                def upgrade_api(request):  | 
            
| 17 | 
                - """  | 
            |
| 18 | 
                - APP 升级  | 
            |
| 19 | 
                - :param request:  | 
            |
| 20 | 
                - :return:  | 
            |
| 21 | 
                - """  | 
            |
| 17 | 
                + """ APP 升级 """  | 
            |
| 22 | 18 | 
                     src = int(request.POST.get('src', 0))
               | 
            
| 23 | 19 | 
                 | 
            
| 24 | 20 | 
                latest_app = get_latest_app(src)  | 
            
                @@ -42,11 +38,7 @@ def upgrade_api(request):  | 
            ||
| 42 | 38 | 
                 | 
            
| 43 | 39 | 
                 | 
            
| 44 | 40 | 
                def online_api(request):  | 
            
| 45 | 
                - """  | 
            |
| 46 | 
                - 是否上线  | 
            |
| 47 | 
                - :param request:  | 
            |
| 48 | 
                - :return:  | 
            |
| 49 | 
                - """  | 
            |
| 41 | 
                + """ 是否上线 """  | 
            |
| 50 | 42 | 
                     platform = request.REQUEST.get('platform', '')
               | 
            
| 51 | 43 | 
                     channel = request.REQUEST.get('channel', '')
               | 
            
| 52 | 44 | 
                     version = request.REQUEST.get('version', '')
               | 
            
                @@ -60,11 +52,7 @@ def online_api(request):  | 
            ||
| 60 | 52 | 
                 | 
            
| 61 | 53 | 
                @logit  | 
            
| 62 | 54 | 
                def splash_api(request):  | 
            
| 63 | 
                - """  | 
            |
| 64 | 
                - 启动页面  | 
            |
| 65 | 
                - :param request:  | 
            |
| 66 | 
                - :return:  | 
            |
| 67 | 
                - """  | 
            |
| 55 | 
                + """ 启动页面 """  | 
            |
| 68 | 56 | 
                     src = int(request.POST.get('src', 0))
               | 
            
| 69 | 57 | 
                 | 
            
| 70 | 58 | 
                splashes = SplashInfo.objects.filter(src=src, status=True)  | 
            
                @@ -77,11 +65,7 @@ def splash_api(request):  | 
            ||
| 77 | 65 | 
                 | 
            
| 78 | 66 | 
                @logit  | 
            
| 79 | 67 | 
                def feedback_api(request):  | 
            
| 80 | 
                - """  | 
            |
| 81 | 
                - 用户反馈  | 
            |
| 82 | 
                - :param request:  | 
            |
| 83 | 
                - :return:  | 
            |
| 84 | 
                - """  | 
            |
| 68 | 
                + """ 用户反馈 """  | 
            |
| 85 | 69 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 86 | 70 | 
                     feedback = request.POST.get('feedback', '')
               | 
            
| 87 | 71 | 
                     src = int(request.POST.get('src', 0))
               | 
            
                @@ -99,11 +83,7 @@ def feedback_api(request):  | 
            ||
| 99 | 83 | 
                 | 
            
| 100 | 84 | 
                 | 
            
| 101 | 85 | 
                def download_api(request):  | 
            
| 102 | 
                - """  | 
            |
| 103 | 
                - 下载接口  | 
            |
| 104 | 
                - :param request:  | 
            |
| 105 | 
                - :return:  | 
            |
| 106 | 
                - """  | 
            |
| 86 | 
                + """ 下载接口 """  | 
            |
| 107 | 87 | 
                if request.weixin:  | 
            
| 108 | 88 | 
                return redirect(settings.DOWNLOAD_WX_URL)  | 
            
| 109 | 89 | 
                if request.iOS:  | 
            
                @@ -27,11 +27,7 @@ WECHAT = settings.WECHAT  | 
            ||
| 27 | 27 | 
                @logit  | 
            
| 28 | 28 | 
                @transaction.atomic  | 
            
| 29 | 29 | 
                def wx_order_create_api(request):  | 
            
| 30 | 
                - """  | 
            |
| 31 | 
                - 订单创建  | 
            |
| 32 | 
                - :param request:  | 
            |
| 33 | 
                - :return:  | 
            |
| 34 | 
                - """  | 
            |
| 30 | 
                + """ 订单创建 """  | 
            |
| 35 | 31 | 
                     group_id = request.POST.get('group_id', '')
               | 
            
| 36 | 32 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 37 | 33 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
                @@ -176,11 +172,7 @@ def order_paid_fail(order):  | 
            ||
| 176 | 172 | 
                @logit  | 
            
| 177 | 173 | 
                @transaction.atomic  | 
            
| 178 | 174 | 
                def wx_order_query_api(request):  | 
            
| 179 | 
                - """  | 
            |
| 180 | 
                - 订单查询  | 
            |
| 181 | 
                - :param request:  | 
            |
| 182 | 
                - :return:  | 
            |
| 183 | 
                - """  | 
            |
| 175 | 
                + """ 订单查询 """  | 
            |
| 184 | 176 | 
                     order_id = request.POST.get('order_id', '')
               | 
            
| 185 | 177 | 
                     transaction_id = request.POST.get('transaction_id', '')
               | 
            
| 186 | 178 | 
                 | 
            
                @@ -223,11 +215,7 @@ def wx_order_query_api(request):  | 
            ||
| 223 | 215 | 
                @logit  | 
            
| 224 | 216 | 
                @transaction.atomic  | 
            
| 225 | 217 | 
                def wx_order_list_api(request):  | 
            
| 226 | 
                - """  | 
            |
| 227 | 
                - 订单列表  | 
            |
| 228 | 
                - :param request:  | 
            |
| 229 | 
                - :return:  | 
            |
| 230 | 
                - """  | 
            |
| 218 | 
                + """ 订单列表 """  | 
            |
| 231 | 219 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 232 | 220 | 
                     page = int(request.POST.get('page', 1))
               | 
            
| 233 | 221 | 
                     num = int(request.POST.get('num', settings.ORDER_NUM_PER_PAGE))
               | 
            
                @@ -245,11 +233,7 @@ def wx_order_list_api(request):  | 
            ||
| 245 | 233 | 
                @logit  | 
            
| 246 | 234 | 
                @transaction.atomic  | 
            
| 247 | 235 | 
                def wx_order_detail_api(request):  | 
            
| 248 | 
                - """  | 
            |
| 249 | 
                - 订单详情  | 
            |
| 250 | 
                - :param request:  | 
            |
| 251 | 
                - :return:  | 
            |
| 252 | 
                - """  | 
            |
| 236 | 
                + """ 订单详情 """  | 
            |
| 253 | 237 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 254 | 238 | 
                     order_id = request.POST.get('order_id', '')
               | 
            
| 255 | 239 | 
                 | 
            
                @@ -267,11 +251,7 @@ def wx_order_detail_api(request):  | 
            ||
| 267 | 251 | 
                @logit  | 
            
| 268 | 252 | 
                @transaction.atomic  | 
            
| 269 | 253 | 
                def wx_notify_url_api(request):  | 
            
| 270 | 
                - """  | 
            |
| 271 | 
                - 支付异步通知回调地址  | 
            |
| 272 | 
                - :param request:  | 
            |
| 273 | 
                - :return:  | 
            |
| 274 | 
                - """  | 
            |
| 254 | 
                + """ 支付异步通知回调地址 """  | 
            |
| 275 | 255 | 
                try:  | 
            
| 276 | 256 | 
                data = xmltodict.parse(request.body)['xml']  | 
            
| 277 | 257 | 
                except xmltodict.ParsingInterrupted:  | 
            
                @@ -33,11 +33,7 @@ r = settings.REDIS_CACHE  | 
            ||
| 33 | 33 | 
                 | 
            
| 34 | 34 | 
                @logit  | 
            
| 35 | 35 | 
                def uuid_init(request):  | 
            
| 36 | 
                - """  | 
            |
| 37 | 
                - 生成唯一标识  | 
            |
| 38 | 
                - :param request:  | 
            |
| 39 | 
                - :return:  | 
            |
| 40 | 
                - """  | 
            |
| 36 | 
                + """ 生成唯一标识 """  | 
            |
| 41 | 37 | 
                     num = int(request.GET.get('num', 1000))
               | 
            
| 42 | 38 | 
                 | 
            
| 43 | 39 | 
                # 生成 UUID  | 
            
                @@ -50,11 +46,7 @@ def uuid_init(request):  | 
            ||
| 50 | 46 | 
                @logit  | 
            
| 51 | 47 | 
                @transaction.atomic  | 
            
| 52 | 48 | 
                def uuid(request):  | 
            
| 53 | 
                - """  | 
            |
| 54 | 
                - 获取唯一标识  | 
            |
| 55 | 
                - :param request:  | 
            |
| 56 | 
                - :return:  | 
            |
| 57 | 
                - """  | 
            |
| 49 | 
                + """ 获取唯一标识 """  | 
            |
| 58 | 50 | 
                     lensman_id = request.POST.get('user_id', '')
               | 
            
| 59 | 51 | 
                     num = int(request.POST.get('num', 100))
               | 
            
| 60 | 52 | 
                 | 
            
                @@ -86,11 +78,7 @@ def uuid(request):  | 
            ||
| 86 | 78 | 
                # curl -X POST -F user_id=xxxxxxx -F session_id=xxxxxxx -F photo_id=xxxxxxx -F photo=@xxxxxxx.jpg http://api.pai.ai/photos/upload  | 
            
| 87 | 79 | 
                @logit  | 
            
| 88 | 80 | 
                def upload_photo(request):  | 
            
| 89 | 
                - """  | 
            |
| 90 | 
                - 上传图片  | 
            |
| 91 | 
                - :param request:  | 
            |
| 92 | 
                - :return:  | 
            |
| 93 | 
                - """  | 
            |
| 81 | 
                + """ 上传图片 """  | 
            |
| 94 | 82 | 
                     lensman_id = request.POST.get('user_id', '')
               | 
            
| 95 | 83 | 
                     session_id = request.POST.get('session_id', '')
               | 
            
| 96 | 84 | 
                     photo_id = request.POST.get('photo_id', '')
               | 
            
                @@ -136,11 +124,7 @@ def upload_photo(request):  | 
            ||
| 136 | 124 | 
                 | 
            
| 137 | 125 | 
                @logit  | 
            
| 138 | 126 | 
                def session_join_api(request):  | 
            
| 139 | 
                - """  | 
            |
| 140 | 
                - Session 详情  | 
            |
| 141 | 
                - :param request:  | 
            |
| 142 | 
                - :return:  | 
            |
| 143 | 
                - """  | 
            |
| 127 | 
                + """ Session 详情 """  | 
            |
| 144 | 128 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 145 | 129 | 
                     session_id = request.POST.get('session_id', '')
               | 
            
| 146 | 130 | 
                     nickname = request.POST.get('nickname', '')
               |